feat: Student Statistics Dashboard #234

piotr-pajak · 2024-11-18T11:18:57Z

Jire issue

Preview

mateuszszczecina · 2024-11-21T14:06:53Z

apps/api/src/statistics/statistics.service.ts

+
+      const daysDiff = differenceInDays(today, lastActivityDate);
+
+      if (daysDiff === 0) return currentStats?.currentStreak ?? 1;


Maybe we should use switch case here, it will be clearer and will work better if there are more conditions in the future

switch (daysDiff) { case 0: return currentStats?.currentStreak ?? 1; case 1: return (currentStats?.currentStreak ?? 0) + 1; default: return 1; }

mateuszszczecina · 2024-11-21T14:10:06Z

apps/web/app/api/generated-api.ts

+      description: string;
+      itemsCount: number;
+      itemsCompletedCount?: number;
+      lessonProgress?: "completed" | "in_progress" | "not_started";


It would be good to create a type for this
type LessonProgress = "completed" | "in_progress" | "not_started";

As the filename indicates, this is a generated API based on the backend schema, so I can't modify the type here 😉

mateuszszczecina · 2024-11-21T14:12:18Z

apps/web/app/components/Gravatar.tsx

  size?: number;
  className?: string;
 };

 export const Gravatar = ({ email, size = 200, className = "" }: GravatarProps) => {
-  const hash = CryptoJS.MD5(email.toLowerCase().trim()).toString();
+  const defaultGravatarHash = "27205e5c51cb03f862138b22bcb5dc20f94a342e744ff6df1b8dc8af3c865109";


maybe we should separate defaultGravatarHash to a file where we keep constant values.

mateuszszczecina · 2024-11-21T14:12:43Z

apps/web/app/components/Gravatar.tsx

@@ -3,19 +3,21 @@ import CryptoJS from "crypto-js";
 import { AvatarImage } from "./ui/avatar";

 type GravatarProps = {
-  email: string;
+  email: string | undefined;


email?: string

I prefer using email: string | undefined instead of email?: string because the email field should always be included in the object, even if its value is undefined.
With email?: string, the property can be completely omitted, which doesn't meet the requirement of ensuring the field is always present.
Using email: string | undefined makes the intent clear that the property is required but can have an undefined value.

mateuszszczecina · 2024-11-21T14:14:06Z

apps/web/app/modules/Statistics/components/ChartLegendBadge.tsx

+import type { ReactNode } from "react";
+
+type ChartLegendBadgeProps = {
+  label: ReactNode | string | undefined;


label?: ReactNode | string
dotColor?: string

Same case as above 😉

mateuszszczecina · 2024-11-21T14:16:41Z

apps/web/app/modules/Statistics/components/RatesChart.tsx

+};
+
+export const RatesChart = ({ isLoading = false, resourceName, chartData }: RatesChartProps) => {
+  const dataMax = Math.max(...chartData.map((d) => d.started));


Change the name to something more descriptive. d -> data.

Also i think it is a good idea to use useMemo in these 4 variables

mateuszszczecina · 2024-11-21T14:17:18Z

apps/web/app/modules/Statistics/components/RatesChart.tsx

+          <Skeleton className="h-6 w-[240px] rounded-lg" />
+          <Skeleton className="w-40 h-4 rounded-lg" />
+        </hgroup>
+        {/*<div className=""></div>*/}


remove unused code

typeWolffo · 2024-11-22T09:56:59Z

apps/web/app/modules/Statistics/utils.ts

@@ -0,0 +1,13 @@
+type Data =


we need to add object to the union just to satisfy typescript, which is not ideal solution but it will work until we figure out how to generate better types from typebox schema

typeWolffo · 2024-11-22T10:02:52Z

apps/web/app/modules/Statistics/Statistics.page.tsx

+      <div className="flex items-center flex-col-reverse 2xl:flex-row gap-y-4 h-full gap-x-7 2xl:h-[calc(100dvh-161px)]">
+        <div className="w-full h-full gap-y-4 2xl:gap-x-4 2xl:gap-y-6 flex flex-col">
+          <div className="flex flex-wrap 2xl:flex-nowrap gap-4 w-full h-full">
+            <ContinueLearningCard isLoading={isLoading} lesson={userStatistics?.lastLesson} />


please use suspense hook for statistics or handle undefined value inside component - I noticed that there is an ts error 😉

mateuszszczecina · 2024-11-25T13:39:19Z

apps/web/app/modules/Courses/Lesson/Summary/index.tsx

@@ -23,6 +23,11 @@ export default function Summary({ lesson }: SummaryProps) {

  const lessonItemsSummary = getSummaryItems(lesson);

+  console.log({ lesson });


remove console.logs

typeWolffo · 2024-11-25T17:13:00Z

apps/web/app/modules/Statistics/components/ProfileWithCalendar.tsx

+            showOutsideDays
+            fixedWeeks
+            weekStartsOn={1}
+            dates={Object.keys(streak?.activityHistory || {}) ?? []}


this will "check" every date even if its false.
What do you think about something like this?

Suggested change

dates={Object.keys(streak?.activityHistory || {}) ?? []}

dates={keys(pickBy(streak?.activityHistory, Boolean))}

I think we can safely apply it in the new PR to avoid possible breaking bugs before the demo 😉

piotr-pajak force-pushed the pp_mw_feat_367_student_statistics_dashboard branch from f680ebb to 1cbd219 Compare November 19, 2024 13:17

piotr-pajak self-assigned this Nov 20, 2024

piotr-pajak marked this pull request as draft November 20, 2024 14:18

piotr-pajak force-pushed the pp_mw_feat_367_student_statistics_dashboard branch 2 times, most recently from 22ca380 to a8e6305 Compare November 21, 2024 11:32

piotr-pajak marked this pull request as ready for review November 21, 2024 14:00

mateuszszczecina reviewed Nov 21, 2024

View reviewed changes

piotr-pajak requested review from typeWolffo and wielopolski November 21, 2024 15:02

piotr-pajak force-pushed the pp_mw_feat_367_student_statistics_dashboard branch from 82e9521 to 35d295b Compare November 21, 2024 16:40

wielopolski force-pushed the pp_mw_feat_367_student_statistics_dashboard branch from 35d295b to 113d47d Compare November 22, 2024 00:08

piotr-pajak force-pushed the pp_mw_feat_367_student_statistics_dashboard branch 3 times, most recently from 57a618c to af32bfd Compare November 22, 2024 09:15

piotr-pajak added the review me 👀 PR is ready to be reviewed label Nov 22, 2024

typeWolffo reviewed Nov 22, 2024

View reviewed changes

piotr-pajak force-pushed the pp_mw_feat_367_student_statistics_dashboard branch 2 times, most recently from 8805632 to 00338a4 Compare November 22, 2024 11:12

mateuszszczecina reviewed Nov 25, 2024

View reviewed changes

piotr-pajak force-pushed the pp_mw_feat_367_student_statistics_dashboard branch from 290f5c7 to c24bd54 Compare November 25, 2024 13:44

piotr-pajak requested a review from mateuszszczecina November 25, 2024 13:45

piotr-pajak force-pushed the pp_mw_feat_367_student_statistics_dashboard branch from c24bd54 to 2ef949f Compare November 25, 2024 13:55

mateuszszczecina approved these changes Nov 25, 2024

View reviewed changes

typeWolffo reviewed Nov 25, 2024

View reviewed changes

wielopolski approved these changes Nov 25, 2024

View reviewed changes

typeWolffo approved these changes Nov 25, 2024

View reviewed changes

piotr-pajak and others added 11 commits November 25, 2024 20:38

feat: initialize statistics page charts

7be0725

refactor: statistics module improvements

9686d48

feat: statistics page

4d3ff14

feat: refactor statistics response

fced63b

refactor: apply review feedback

fc32e73

feat: update avg quiz results

7b20a51

feat: update lessons statistics result

55094fe

feat: update coursess statistics result

f07eb26

fix: calculate lesson progress summary

8136ef1

refaactor: update react-day-picker component according to new version

a2e736b

fix: repair 0011_update_courses_table migration

1beeec4

piotr-pajak force-pushed the pp_mw_feat_367_student_statistics_dashboard branch 2 times, most recently from da3bb7e to 10d992e Compare November 25, 2024 19:45

refactor: apply review feedback

ff7cb5d

piotr-pajak force-pushed the pp_mw_feat_367_student_statistics_dashboard branch 2 times, most recently from fa7fcf5 to ea88cca Compare November 25, 2024 19:47

feat: update last lesson return in statistics response

e22f6e6

piotr-pajak force-pushed the pp_mw_feat_367_student_statistics_dashboard branch from ea88cca to e22f6e6 Compare November 25, 2024 19:56

piotr-pajak added merge me 💚 PR is ready to be merged and removed review me 👀 PR is ready to be reviewed labels Nov 25, 2024

piotr-pajak merged commit 0a143bd into main Nov 25, 2024
6 checks passed

piotr-pajak deleted the pp_mw_feat_367_student_statistics_dashboard branch November 25, 2024 19:58

piotr-pajak restored the pp_mw_feat_367_student_statistics_dashboard branch November 26, 2024 14:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Student Statistics Dashboard #234

feat: Student Statistics Dashboard #234

piotr-pajak commented Nov 18, 2024 •

edited by jira bot

Loading

mateuszszczecina Nov 21, 2024

mateuszszczecina Nov 21, 2024

piotr-pajak Nov 21, 2024

mateuszszczecina Nov 21, 2024

mateuszszczecina Nov 21, 2024

piotr-pajak Nov 21, 2024

mateuszszczecina Nov 21, 2024

piotr-pajak Nov 21, 2024

mateuszszczecina Nov 21, 2024

mateuszszczecina Nov 21, 2024

typeWolffo Nov 22, 2024

typeWolffo Nov 22, 2024

mateuszszczecina Nov 25, 2024

typeWolffo Nov 25, 2024

typeWolffo Nov 25, 2024


		const daysDiff = differenceInDays(today, lastActivityDate);

		if (daysDiff === 0) return currentStats?.currentStreak ?? 1;

		@@ -23,6 +23,11 @@ export default function Summary({ lesson }: SummaryProps) {

		const lessonItemsSummary = getSummaryItems(lesson);

		console.log({ lesson });

	dates={Object.keys(streak?.activityHistory \|\| {}) ?? []}
	dates={keys(pickBy(streak?.activityHistory, Boolean))}

feat: Student Statistics Dashboard #234

feat: Student Statistics Dashboard #234

Conversation

piotr-pajak commented Nov 18, 2024 • edited by jira bot Loading

Jire issue

Preview

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

piotr-pajak commented Nov 18, 2024 •

edited by jira bot

Loading